File: merge-old-conflicts-file

package info (click to toggle)
monotone 1.1-9
  • links: PTS, VCS
  • area: main
  • in suites: stretch
  • size: 20,984 kB
  • ctags: 8,622
  • sloc: cpp: 86,450; sh: 6,906; perl: 924; makefile: 813; python: 517; lisp: 379; sql: 118; exp: 91; ansic: 52
file content (6 lines) | stat: -rw-r--r-- 272 bytes parent folder | download | duplicates (5) 
1
2
3
4
5
6
 
mtn: 2 heads on branch 'testbranch'
mtn: merge 1 / 1:
mtn: calculating best pair of heads to merge next
mtn: [left]  52f8049a6454895521a6a5f7d739ebfd58e72655
mtn: [right] 7d425fa3827653bfc4ea9b62560ef896bb3c83ca
mtn: misuse: right revision id does not match conflict file