1. 03 Feb, 2013 2 commits
  2. 29 Jan, 2013 3 commits
  3. 28 Jan, 2013 2 commits
  4. 25 Jan, 2013 3 commits
  5. 25 Sep, 2012 1 commit
  6. 10 Aug, 2012 1 commit
  7. 23 Jul, 2012 1 commit
    • Junio C Hamano's avatar
      mergetool: support --tool-help option like difftool does · 109859e2
      Junio C Hamano authored
      This way we do not have to risk the list of tools going out of sync
      between the implementation and the documentation.
      
      In the same spirit as bf73fc21 (difftool: print list of valid tools
      with '--tool-help', 2012-03-29), trim the list of merge backends in
      the documentation.  We do not want to have a complete list of valid
      tools; we only want a list to help people guess what kind of things
      the tools do to be specified there, and refer them to --tool-help
      for a complete list.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      109859e2
  8. 20 Sep, 2011 1 commit
  9. 19 Aug, 2011 2 commits
  10. 05 Aug, 2011 1 commit
  11. 26 May, 2011 1 commit
  12. 01 May, 2011 1 commit
    • Ciaran Jessup's avatar
      Pass empty file to p4merge where no base is suitable. · 0a0ec7bd
      Ciaran Jessup authored
      Modify the p4merge client command to pass a reference to an empty file
      instead of the local file when no base revision available.
      
      In the situation where a merge tries to add a file from one branch
      into a branch that already contains that file (by name), p4merge
      currently seems to have successfully automatically resolved the
      'conflict' when it is opened (correctly if the files differed by
      just whitespace for example) but leaves the save button disabled. This
      means the user of the p4merge client cannot commit the resolved
      changes back to disk and merely exits, leaving the original
      (merge-conflicted) file intact on the disk.
      
      Provide an empty base file to p4merge so that it leaves the save
      button enabled.  This will allow saving of the auto-resolution to
      disk.
      Signed-off-by: default avatarCiaran Jessup <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      0a0ec7bd
  13. 28 Feb, 2011 2 commits
  14. 25 Feb, 2011 1 commit
  15. 29 Sep, 2010 1 commit
  16. 15 Sep, 2010 2 commits
  17. 20 Aug, 2010 1 commit
  18. 29 Jan, 2010 1 commit
    • Jeff King's avatar
      add shebang line to git-mergetool--lib.sh · 02e51243
      Jeff King authored
      Even though this script is expected to be sourced instead of
      executed on its own, the #!/bin/sh line provides simple
      documentation about what format the file is in.
      
      In particular, the lack of such a line was confusing the
      valgrind support of our test scripts, which assumed that any
      executable without a #!-line should be intercepted and run
      through valgrind. So during valgrind-enabled tests, any
      script sourcing this file actually sourced the valgrind
      interception script instead.
      Signed-off-by: default avatarJeff King <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      02e51243
  19. 23 Nov, 2009 1 commit
  20. 28 Oct, 2009 1 commit
  21. 24 May, 2009 1 commit
  22. 09 May, 2009 1 commit
  23. 12 Apr, 2009 1 commit
  24. 08 Apr, 2009 1 commit