summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2016-10-07 16:58:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-11 10:04:23 -0700
commit08221e3fa27396aca30cb539f006f78636782951 (patch)
tree71f5d7b2f8834931b70b19ba74355572445ae9f0 /Documentation/git-mergetool.txt
parentmergetool: add copyright (diff)
downloadtgif-08221e3fa27396aca30cb539f006f78636782951.tar.xz
mergetool: move main program flow into a main() function
Make it easier to follow the program's flow by isolating all logic into functions. Isolate the main execution code path into a single unit instead of having prompt_after_failed_merge() interrupt it partyway through. The use of a main() function is borrowing a convention from C, Python, Perl, and many other languages. This helps readers more familiar with other languages understand the purpose of each function when diving into the codebase with fresh eyes. Signed-off-by: David Aguilar <davvid@gmail.com> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions