summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-27 12:26:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-27 12:26:21 -0700
commitfb3e7d5515308c73c54c797356651d6ca41b58a6 (patch)
tree3471f36c2bf7764727980bbf8fe3127447d9480d /Documentation/merge-options.txt
parentRelNotes: wordsmithing (diff)
parentGit 2.3.7 (diff)
downloadtgif-fb3e7d5515308c73c54c797356651d6ca41b58a6.tar.xz
Sync with 2.3.7
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions