Rivoreo Source Code Repositories
src.rivoreo.one / tmux / 253f1395a03b7b3371799055a7e3a442a8fa7ba6
commit253f1395a03b7b3371799055a7e3a442a8fa7ba6[log] [download]
authorThomas Adam <thomas@xteddy.org>Mon Sep 24 18:03:04 2012 +0100
committerThomas Adam <thomas@xteddy.org>Mon Sep 24 18:05:34 2012 +0100
tree63acaecc3becf3d980f1b197e4e6bcad49a86951
parente342304134b8012ae62cb627dc9e322411dd48b1 [diff]
Don't rely on "-s ours" for merging

The ours strategy assumes one subsumes the other -- which isn't the case for
the portable version, so for now -- just go back to using the default merge
strategy of recursive, and fix-up any conflicts manually.
1 file changed
tree: 63acaecc3becf3d980f1b197e4e6bcad49a86951
  1. .gitignore
  2. CHANGES
  3. FAQ
  4. Makefile.am
  5. NOTES
  6. SYNCING
  7. TODO
  8. arguments.c
  9. array.h
  10. attributes.c
  11. autogen.sh
  12. cfg.c
  13. client.c
  14. clock.c
  15. cmd-attach-session.c
  16. cmd-bind-key.c
  17. cmd-break-pane.c
  18. cmd-capture-pane.c
  19. cmd-choose-buffer.c
  20. cmd-choose-client.c
  21. cmd-choose-list.c
  22. cmd-choose-tree.c
  23. cmd-clear-history.c
  24. cmd-clock-mode.c
  25. cmd-command-prompt.c
  26. cmd-confirm-before.c
  27. cmd-copy-mode.c
  28. cmd-delete-buffer.c
  29. cmd-detach-client.c
  30. cmd-display-message.c
  31. cmd-display-panes.c
  32. cmd-find-window.c
  33. cmd-has-session.c
  34. cmd-if-shell.c
  35. cmd-join-pane.c
  36. cmd-kill-pane.c
  37. cmd-kill-server.c
  38. cmd-kill-session.c
  39. cmd-kill-window.c
  40. cmd-link-window.c
  41. cmd-list-buffers.c
  42. cmd-list-clients.c
  43. cmd-list-commands.c
  44. cmd-list-keys.c
  45. cmd-list-panes.c
  46. cmd-list-sessions.c
  47. cmd-list-windows.c
  48. cmd-list.c
  49. cmd-load-buffer.c
  50. cmd-lock-server.c
  51. cmd-move-window.c
  52. cmd-new-session.c
  53. cmd-new-window.c
  54. cmd-paste-buffer.c
  55. cmd-pipe-pane.c
  56. cmd-refresh-client.c
  57. cmd-rename-session.c
  58. cmd-rename-window.c
  59. cmd-resize-pane.c
  60. cmd-respawn-pane.c
  61. cmd-respawn-window.c
  62. cmd-rotate-window.c
  63. cmd-run-shell.c
  64. cmd-save-buffer.c
  65. cmd-select-layout.c
  66. cmd-select-pane.c
  67. cmd-select-window.c
  68. cmd-send-keys.c
  69. cmd-send-prefix.c
  70. cmd-server-info.c
  71. cmd-set-buffer.c
  72. cmd-set-environment.c
  73. cmd-set-option.c
  74. cmd-show-buffer.c
  75. cmd-show-environment.c
  76. cmd-show-messages.c
  77. cmd-show-options.c
  78. cmd-source-file.c
  79. cmd-split-window.c
  80. cmd-start-server.c
  81. cmd-string.c
  82. cmd-suspend-client.c
  83. cmd-swap-pane.c
  84. cmd-swap-window.c
  85. cmd-switch-client.c
  86. cmd-unbind-key.c
  87. cmd-unlink-window.c
  88. cmd.c
  89. colour.c
  90. compat.h
  91. compat/
  92. configure.ac
  93. control-notify.c
  94. control.c
  95. environ.c
  96. examples/
  97. format.c
  98. grid-utf8.c
  99. grid-view.c
  100. grid.c
  101. input-keys.c
  102. input.c
  103. job.c
  104. key-bindings.c
  105. key-string.c
  106. layout-custom.c
  107. layout-set.c
  108. layout.c
  109. log.c
  110. mode-key.c
  111. names.c
  112. notify.c
  113. options-table.c
  114. options.c
  115. osdep-aix.c
  116. osdep-darwin.c
  117. osdep-dragonfly.c
  118. osdep-freebsd.c
  119. osdep-hpux.c
  120. osdep-linux.c
  121. osdep-netbsd.c
  122. osdep-openbsd.c
  123. osdep-sunos.c
  124. osdep-unknown.c
  125. paste.c
  126. resize.c
  127. screen-redraw.c
  128. screen-write.c
  129. screen.c
  130. server-client.c
  131. server-fn.c
  132. server-window.c
  133. server.c
  134. session.c
  135. signal.c
  136. status.c
  137. tmux.1
  138. tmux.c
  139. tmux.h
  140. tools/
  141. tty-acs.c
  142. tty-keys.c
  143. tty-term.c
  144. tty.c
  145. utf8.c
  146. window-choose.c
  147. window-clock.c
  148. window-copy.c
  149. window.c
  150. www/
  151. xmalloc.c
  152. xterm-keys.c