equal
deleted
inserted
replaced
773 # hg stat |
773 # hg stat |
774 M f |
774 M f |
775 |
775 |
776 Issue3581: Merging a filename that needs to be quoted |
776 Issue3581: Merging a filename that needs to be quoted |
777 |
777 |
|
778 #if no-windows |
778 $ beforemerge |
779 $ beforemerge |
779 [merge-tools] |
780 [merge-tools] |
780 false.whatever= |
781 false.whatever= |
781 true.priority=1 |
782 true.priority=1 |
782 true.executable=cat |
783 true.executable=cat |
794 $ hg merge --config merge-tools.true.executable="true" -r 4 |
795 $ hg merge --config merge-tools.true.executable="true" -r 4 |
795 merging "; exit 1; echo " |
796 merging "; exit 1; echo " |
796 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
797 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
797 (branch merge, don't forget to commit) |
798 (branch merge, don't forget to commit) |
798 $ hg update -C 1 > /dev/null |
799 $ hg update -C 1 > /dev/null |
|
800 #endif |
799 |
801 |
800 Merge post-processing |
802 Merge post-processing |
801 |
803 |
802 cat is a bad merge-tool and doesn't change: |
804 cat is a bad merge-tool and doesn't change: |
803 |
805 |