Skip to content

Commit

Permalink
Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
Browse files Browse the repository at this point in the history 
* jc/maint-mergetool-style-fix:
  mergetool: style fixes
  • Loading branch information
Junio C Hamano committed Sep 11, 2012
2 parents ee7a83f + f8750a0 commit 23242a6
Showing 1 changed file with 308 additions and 273 deletions.
Loading

0 comments on commit 23242a6

Please sign in to comment.